Applied patch from dmacks@netspace.org closing bug #519796

* configure.ac:
* babl/Makefile.am:
* tests/Makefile.am: Only -ldl if required, passed automatically via
$LIBS

svn path=/trunk/; revision=289

diff --git a/ChangeLog b/ChangeLog
index 0ebb3734b58fae622f612abedac2ee0a8c8dce3c..83ccc97477eaddd4895cc900fd73bc2d30354835 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-02  Øyvind Kolås  <pippin@gimp.org>
+
+       Applied patch from dmacks@netspace.org closing bug #519796
+       * configure.ac:
+       * babl/Makefile.am:
+       * tests/Makefile.am: Only -ldl if required, passed automatically via
+       $LIBS
+
 2008-02-27  Øyvind Kolås  <pippin@gimp.org>
 
        * configure.ac: post release version increment to 0.0.21

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 24c3048075e08c612764e9694ae5e66b471c9b96..41c3602a92882c005512c305a8d0689aad0b441b 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -54,5 +54,5 @@ libbabl_@BABL_API_VERSION@_la_LIBADD=\
        @LTLIBOBJS@
 
 libbabl_@BABL_API_VERSION@_la_LDFLAGS=                 \
-       ${no_undefined} ${DL_LIB} $(MATH_LIB)   \
+       ${no_undefined} $(MATH_LIB)     \
        -version-info $(BABL_LIBRARY_VERSION)

diff --git a/configure.ac b/configure.ac
index 271824bb3718004b591012f53fe74f67136b613f..fada2b2aea1f1193fa730ad9e523c598df88fb66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -226,8 +226,7 @@ AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 
 dnl ===========================================================================
 
-AC_CHECK_LIB([dl], [dlopen], [DL_LIB="-ldl"])
-AC_SUBST(DL_LIB)
+AC_SEARCH_LIBS([dlopen], [dl])
 
 AC_REPLACE_FUNCS(gettimeofday)
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e289b9df1e01856aa976071dfe48e5101311a2d6..8e514578cb87e69b437fa4f00d541de3827d49b2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ models_SOURCES              = models.c
 AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
-       $(DL_LIB) $(MATH_LIB)
+       $(MATH_LIB)
 
 noinst_PROGRAMS =              \
        introspect              \